Push GdkRGB's visual and colormap around the color selection dialog so

Tue Jan  5 19:01:18 1999  Owen Taylor  <otaylor@redhat.com>

	* gtk/gtkcolorsel.c (gtk_color_selection_dialog_init): Push
	GdkRGB's visual and colormap around the color selection
	dialog so that the window and the previews have the
	same colormap. If an app adds things to the colorsel
	dialog, it will have to take care of them itself.

diff --git a/ChangeLog b/ChangeLog
index 051eedb289996af3cbcdaa4a4ed4e440ce3c9ba6..19ab446c7e1510c76d3fbb70635dbb15adb44338 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+Tue Jan  5 19:01:18 1999  Owen Taylor  <otaylor@redhat.com>
+
+       * gtk/gtkcolorsel.c (gtk_color_selection_dialog_init): Push
+       GdkRGB's visual and colormap around the color selection
+       dialog so that the window and the previews have the
+       same colormap. If an app adds things to the colorsel
+       dialog, it will have to take care of them itself.
+
 Tue Jan  5 15:03:47 1999  Owen Taylor  <otaylor@redhat.com>
 
        * gtk/gtkmain.c (gtk_propagate_event): Make 

diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0
index 051eedb289996af3cbcdaa4a4ed4e440ce3c9ba6..19ab446c7e1510c76d3fbb70635dbb15adb44338 100644 (file)
--- a/ChangeLog.pre-2-0
+++ b/ChangeLog.pre-2-0
@@ -1,3 +1,11 @@
+Tue Jan  5 19:01:18 1999  Owen Taylor  <otaylor@redhat.com>
+
+       * gtk/gtkcolorsel.c (gtk_color_selection_dialog_init): Push
+       GdkRGB's visual and colormap around the color selection
+       dialog so that the window and the previews have the
+       same colormap. If an app adds things to the colorsel
+       dialog, it will have to take care of them itself.
+
 Tue Jan  5 15:03:47 1999  Owen Taylor  <otaylor@redhat.com>
 
        * gtk/gtkmain.c (gtk_propagate_event): Make 

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 051eedb289996af3cbcdaa4a4ed4e440ce3c9ba6..19ab446c7e1510c76d3fbb70635dbb15adb44338 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,11 @@
+Tue Jan  5 19:01:18 1999  Owen Taylor  <otaylor@redhat.com>
+
+       * gtk/gtkcolorsel.c (gtk_color_selection_dialog_init): Push
+       GdkRGB's visual and colormap around the color selection
+       dialog so that the window and the previews have the
+       same colormap. If an app adds things to the colorsel
+       dialog, it will have to take care of them itself.
+
 Tue Jan  5 15:03:47 1999  Owen Taylor  <otaylor@redhat.com>
 
        * gtk/gtkmain.c (gtk_propagate_event): Make 

diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2
index 051eedb289996af3cbcdaa4a4ed4e440ce3c9ba6..19ab446c7e1510c76d3fbb70635dbb15adb44338 100644 (file)
--- a/ChangeLog.pre-2-2
+++ b/ChangeLog.pre-2-2
@@ -1,3 +1,11 @@
+Tue Jan  5 19:01:18 1999  Owen Taylor  <otaylor@redhat.com>
+
+       * gtk/gtkcolorsel.c (gtk_color_selection_dialog_init): Push
+       GdkRGB's visual and colormap around the color selection
+       dialog so that the window and the previews have the
+       same colormap. If an app adds things to the colorsel
+       dialog, it will have to take care of them itself.
+
 Tue Jan  5 15:03:47 1999  Owen Taylor  <otaylor@redhat.com>
 
        * gtk/gtkmain.c (gtk_propagate_event): Make 

diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4
index 051eedb289996af3cbcdaa4a4ed4e440ce3c9ba6..19ab446c7e1510c76d3fbb70635dbb15adb44338 100644 (file)
--- a/ChangeLog.pre-2-4
+++ b/ChangeLog.pre-2-4
@@ -1,3 +1,11 @@
+Tue Jan  5 19:01:18 1999  Owen Taylor  <otaylor@redhat.com>
+
+       * gtk/gtkcolorsel.c (gtk_color_selection_dialog_init): Push
+       GdkRGB's visual and colormap around the color selection
+       dialog so that the window and the previews have the
+       same colormap. If an app adds things to the colorsel
+       dialog, it will have to take care of them itself.
+
 Tue Jan  5 15:03:47 1999  Owen Taylor  <otaylor@redhat.com>
 
        * gtk/gtkmain.c (gtk_propagate_event): Make 

diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index 051eedb289996af3cbcdaa4a4ed4e440ce3c9ba6..19ab446c7e1510c76d3fbb70635dbb15adb44338 100644 (file)
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,11 @@
+Tue Jan  5 19:01:18 1999  Owen Taylor  <otaylor@redhat.com>
+
+       * gtk/gtkcolorsel.c (gtk_color_selection_dialog_init): Push
+       GdkRGB's visual and colormap around the color selection
+       dialog so that the window and the previews have the
+       same colormap. If an app adds things to the colorsel
+       dialog, it will have to take care of them itself.
+
 Tue Jan  5 15:03:47 1999  Owen Taylor  <otaylor@redhat.com>
 
        * gtk/gtkmain.c (gtk_propagate_event): Make 

diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index 051eedb289996af3cbcdaa4a4ed4e440ce3c9ba6..19ab446c7e1510c76d3fbb70635dbb15adb44338 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,11 @@
+Tue Jan  5 19:01:18 1999  Owen Taylor  <otaylor@redhat.com>
+
+       * gtk/gtkcolorsel.c (gtk_color_selection_dialog_init): Push
+       GdkRGB's visual and colormap around the color selection
+       dialog so that the window and the previews have the
+       same colormap. If an app adds things to the colorsel
+       dialog, it will have to take care of them itself.
+
 Tue Jan  5 15:03:47 1999  Owen Taylor  <otaylor@redhat.com>
 
        * gtk/gtkmain.c (gtk_propagate_event): Make 

diff --git a/gdk/gdktypes.h b/gdk/gdktypes.h
index 30088c405ed446e076ebdbf4011933a6f5b29fa6..ea9fc102c9a73faa9efbc7cb259906dfd53a4cb5 100644 (file)
--- a/gdk/gdktypes.h
+++ b/gdk/gdktypes.h
@@ -734,8 +734,9 @@ typedef enum {
 typedef enum {
   GDK_DRAG_PROTO_MOTIF,
   GDK_DRAG_PROTO_XDND,
-  GDK_DRAG_PROTO_ROOTWIN       /* A root window with nobody claiming
+  GDK_DRAG_PROTO_ROOTWIN,      /* A root window with nobody claiming
                                 * drags */
+  GDK_DRAG_PROTO_NONE          /* Not a valid drag window */
 } GdkDragProtocol;
 
 /* The color type.

diff --git a/gtk/gtkcolorsel.c b/gtk/gtkcolorsel.c
index 8db7530bafb7b187efc89bd065dbfaa2815c923d..3f53327decebdfd8f693bff98d3aec3a3ed56ede 100644 (file)
--- a/gtk/gtkcolorsel.c
+++ b/gtk/gtkcolorsel.c
@@ -1614,6 +1614,9 @@ gtk_color_selection_dialog_init (GtkColorSelectionDialog *colorseldiag)
 {
   GtkWidget *action_area, *frame;
 
+  gtk_widget_push_visual (gdk_rgb_get_visual ());
+  gtk_widget_push_colormap (gdk_rgb_get_cmap ());
+
   colorseldiag->main_vbox = gtk_vbox_new (FALSE, 10);
   gtk_container_set_border_width (GTK_CONTAINER (colorseldiag), 10);
   gtk_container_add (GTK_CONTAINER (colorseldiag), colorseldiag->main_vbox);
@@ -1649,6 +1652,9 @@ gtk_color_selection_dialog_init (GtkColorSelectionDialog *colorseldiag)
   GTK_WIDGET_SET_FLAGS (colorseldiag->help_button, GTK_CAN_DEFAULT);
   gtk_box_pack_start (GTK_BOX (action_area), colorseldiag->help_button, TRUE, TRUE, 0);
   gtk_widget_show (colorseldiag->help_button);
+
+  gtk_widget_pop_colormap ();
+  gtk_widget_pop_visual ();
 }
 
 GtkWidget *